css moved to better location, some structural changes