Fixes markup outline, and reduces tab size
Major style overhaul, plus markup corrections