These two VCs were to similar... make them inherit from a single controller

:sparkles: