modified ui a bit