Added more screens, added overlay capabilities