More tweaks, and fixed the program buttons.