Continued work. Live layout improved.