Made layout more reusable and  customizable