Work on layout
Updated auto layout