improved basic watch panel

general ux/ui improvements