fixes models and remove button
Merge branch 'master' of https://github.com/Rosie-Brigham/nitelife into rk_bug_fix2
fixes tests
Merge pull request #31 from Rosie-Brigham/rk_bug_fix2

Rk bug fix2