Added layout and controller updates