Fixed the overflow issue for primary theme