Updated Layout

Please Merge