Update control prefixes and unify ui - Update #31