Fixed some UI bugs, added normal mode