Merge pull request #615 from FransTwisk/front-end

Small fixes tasks
Fixed button issue