layout cleanup

clean up errors caused by new larger buttons.