fixed lots of UI issues