Revert "Syntax extra/missing commas"

This reverts commit c9020a1e66ae273f2dfb6d85cafc4200de4222d6.
Revert "Fix double border dropdowns"

This reverts commit 84b4950dfdcfa4bc3beb912516c5b60a83db53cd.