Refactor to proper commits

[keshto]

1530295 should be refactored back to the relevant commits before it.
The "Add window menu" commit, also has a change to the text buffer which should be placed in the text buffer commit.