Updated coding conventions
Cleaned up workspace
Small fixes and improvements. Added basic lay-outing
Added few menu-related tasks