code cleanp & design change
Merge branch 'master' of https://github.com/lambda-co-at/website