Some layout changes to main activity