I think you did well to move to the long wall.  I've tried it the other way and it was pretty awful.  The inset area is perfect for your gear. 

There is a way to update your component list.  It took me a while to figure it out and now I don't remember what I did.  Lol.