Change ul/li-s with divs
Merge branch 'master' into infinite
Don't scroll if validate returns false