Simplify wall/floor code.  More UI.