Default sort and some margins

Added in a default sort option and made margins between the sort and
filter buttons dependent on whether both were present, as opposed to
always there.