Better Layout and Bugfixes

Maybe you fall in love with this :dancer: