Fixed UI issues after code restructre.