Larger side margin
Added some group headers