full UI update, looks good now