Style tweaks - 80% draft complete