GUI layout now sucks less
Merge branch 'master' of local repository into OrdersTab