Changed the layout all together and started over