applied changed suggested in code review
refs #550
Merge branch 'photos-button_menu-header' of ssh://git.braintech.pl/pisak into photos-button_menu-header