Layout update

Updated layout and views