changed ui a bit again