Merge pull request #11 from Empters/front

Front
Merge remote-tracking branch 'origin' into front
green dot added int the categories according the design