Code is prettier, and added numberfield to settings menu