minor code structure and css changes