being consistent
prepared ui code for splitting to separate namespaces