Changed the layout and structure