Revert "Made a custom spinner layout that was smaller so the spinners on the settings screen fit better. Fixed some layout issues."

This reverts commit a3f3c4b7cfd3b37f1fde36a914a66a9f8abd80d3.