Added layout and stiles