Adds top plane and fixes mask on SoC