Refactor and cleanup.
Added block for menu 6.
Merge branch 'development' of github.com:aakb/odaa_dk into development