Removed unnecassary layout