Minor changes. Added wall button but no functionality yet