Minor design tweaks, made things into buttons