Merge pull request #614 from FransTwisk/front-end

Front end
Small fixes tasks