Moved home & systemInfo screens to separate classes