Small layout fixes
removing trailing spaces
Integrated with content_fors