Fixed bugs and changed style