First pass at fixing up the buttons