Fixed bugs and layout.