Refactoring ui and adding in more types to be created / edited