Bug fixes, ui improvements