Added wall view, fixed a few bugs