Commit 2: Main window