Cosmetic changes as well as improved display formatting and some javascript refactoring