simplified views
misc. changes
class added to links
Merge branches 'sachin87-master' and 'master'