Small changes to the main activity and layout