Disabled statuses handling
Restructured the views