5th day of work, major reorganization and update of UI code