removed number formatting, cleaned up some button and form sstuff