NXP-12105: Move buttons outside of content