Updating the layouts so that it fits on the smaller devices