Updated layout to work correctly in landscape as well as portrait