Commit No. 2 - UI design underway