Fixed missing heading from messed up merge
fixed up some bootstrap formatting (rows/spans)