modified layout; added mousetrap