various UI and UIX updates