WindowStack refactor - Buttons