Rework layout to use hints, add landscape layout