UI fixes

See: https://trello.com/card/ui-data-gov-changes/518b9273abaf88791a003fb5/26