changes for bugs and CSS