Updated UI modules to remove add forms where possible