Cleaned up the less mess; all titles now links
fixed conflicts
merged layout update from cblgh