Removed title bar and fixed sizing
Merge branch 'local'