[sprint 6] merge page design rework