Feature/eng 266 maaz feature page

Closing branch to pickup andrew's changes and then rebranch.