made various cosmetic changes to views and css
repaired merge conflicts