Fix auto layout constraints, naming, add groups, start cleaning code