fixes - ui improvements