fixed table layout, added spinner
Merge branch 'develop' into shane
Merge pull request #21 from palmerhyde/shane

Fixed UI