Finishing touches on gender buttons, and general cleanup