Adding more screens, functions