Reduce more duplication and force application layout