UI fix
UI finalization
finalize UI