More modest nav margin
Removed quotes. Caused more trouble than they're worth
Some minor folder restructuring
More minor restructuring
Finalised folder restructuring