Fix switch positioning and update gitignore