3.9

UI for 3.9
Merge pull request #1 from herewithme/UI-update

3.9