Layout improvements and bug fixes.