Simplified wireframes and added additional features.