implemented #4,#3 and improved ui a little