Various fixes
Merge branch 'master' of https://github.com/Soabirw/Camen-Designs-Portfolio