Finish gui
add kunstgriff
commit
Merged 'dev'.