Cleanup and more css changes