Fix the rendering
Some more fixes and styles