second commit: more ui