Fixes and added zindex property on models