Some bugfixes

New design