Commit on second day. Major work on UI part