study refactor + gender and year buttons
Merge remote-tracking branch 'origin/master'