Moved around buttons a bit