Add functional test, styles & images
Merge branch 'develop'