Bug fixes and layout cleaning.