Moved collapsible button to main, and fixed some portlet padding
fixing small missed things