Fixed rendering bug
First working version
Style changes