Changed conditional tags to work with new computed properties in the component.