Back to declarative layout and adding headers and button container