Fix buttons so they say where they are going (#38)

Also slight finagling to get buttons to actually go smart places. This should completely fix #38.