fixing issue with not showing the button
Merge branch 'ss-s2-pages'
Merge branch 'master' of https://github.com/ST-Team5/LiveBetterClient