Update to layout and few fixes