Small changes - heading and menu
Cleanup
Improvements
Prototyping