Window now looks nicer. Though the code is messy.
Merge branch 'feat/basicWindow'