Items in their right places
Still a lot of bugs here