Refactor phone forms, controller & update layout