Fixing layout bugs
Improved UX