HWPI base layout: remove extra padding right/left