cleaned up design for mobile optimization