Fixed main design bug
Merge branch 'master' of https://github.com/leowns/spotted