Swap order of name and nickname
Refactored containers from layout to each view