Added custom info view and 3 states