Fix Stray buttons jumping around, Reformat code