lots of small improvements + 'list by district' feature

Change-Id: Ic846c01e54a0fd1c5b4793d74ce5b8bff94c0384