fixed more bugs and added more css