Update to 2.8

Clean up source
Prepare settings menu
....