#70 Minor bug fixes and better presentation of the page implemented.