final touches/fixes to ui