unified naming convention, added some oversightly ui-functions..