Added resources controller and updated navigation for resources
various fixes