Moving screen functions to a new class