Fixed css issue, removed unused code, added check for window def

Fixed css issue, removed unused code, added check for window def #423