merge
improved portlet render and add options to manage different grid layout