Bug fixes and UI tidying.