more interface unification and bug fixes
user interface unification continued