UI bug fix
works right now but not so gud