Designed UI for the main window
Merged branches