Minor gui changes and code restructuring
Fix bug that occurred when user skipped suggesting a category