Frontend Implemented
Merge branch 'master' into slick