Finish gui
Merged 'dev'.