Styled create new orgunit and removed some bugs