Updates to categories views. Fix checkin and checkout