bug fixes. UI finalization
bug fixes. UI finalization