MVP-240 Some layout fixes and generating toc for Complex Types