Adapted to specific a4y screens and some code cleanup.