Improve button styles
Replaced back button modal
Merge pull request #1389 from FransTwisk/CLUB-562

Club 562