Fixed multiple errors on floor- plan