fix combo buttons margins on mobile, and refactor