Fixing some HTML problems
Extracting view logic
Misc fixes for some content errors
Nit
Minor improvements to display