Fixing some layout bugs