Split controller from views more