Fix bugs and incorrect styles