Layout update

Also simplified all index pages