Make the layout more mobile friendly
Merge the mobile changes