Updates in layout and added some todos