Merge style updates from Planet Venus, reorganize CSS