Using table views instead of custom views, phase 1
Using table views instead of custom views, phase 2
Appearance cleanups