Fixed error in layout
Merge branch 'master' of github.com:JvG94/crossinghippos
Fixed bugs