Reflowed code

Now it fits my personal taste :smile_cat:
Consolidated lines, fixed nav

Nav no longer overruns! :smiley_cat:
Padding :scream_cat:
Merge remote-tracking branch 'origin/tweaking'

Conflicts:
	cw2style.css