Completed controller api and more of UI components