removed unnecesary layouts