added light functionality and better screen formatting