Refactoring, fixed bugs and smaller improvement of rendering.