UI fixes, everything fits in the screen now