Feature/sticky header bugfixes

Stories:
https://www.pivotaltracker.com/story/show/68082300
https://www.pivotaltracker.com/story/show/70435222