Bug fix and new mustache/css