Fixed stacked area and minor improvements