Improvements to layout and bug fixes.