Removal of old stuff and css fix