some cleanup and minor css changes