Removed unnecessary layouts and configured tall layout to be nicer