modified some screen functionality