couple of UI issues fixed