Updated Layout to prettify type