Separated the layout into different modules