minor refactoring and css changes