Re-orging item locations
Added missing things