Added tap handling and reorganized content.