Fixed errors with tests. Re-integrated html into layout,erb