first ui version + minimal changes from alex