Default window size
Code cleanup
Settings issue
Merge branch 'master' of github.com:manudwarf/dbmaster