Fixed CSS
Fixes #153
Work on #51 | Many improvements / fixes