Added structure for ConnectionViewController, restructured CategoryViewController modals