Issue/11

fixes #11 
Please move these functions to MainScreen, as that's the actual screen that uses these.