Added defined screens. Not as clean as I'd like