Add constrctors to all screens. Move things from controller/