Cuc steps refactoring …

- minor changes for consistency in basic_layout.feature and create_users.feature
- moved user specific steps from basic to user_steps
- minor refactoring in basic_steps