Template and CSS changes. Minor bug fix.