Merge pull request #684 from FransTwisk/front-end-refactored

Front end refactored