Bugfixes and layout updates, level name now displayed
Fixing some conflicts
... again