bunch of changes to jsp and css and stuff