Clean up item tab logic and view