Updates to layout to support tablet and landscape