Refactor/Fix/Update Layouts