Re-design complete with auto layout