Updating the layout xml's to look better