button spacing and code cleanup