Major template/css changes