panel ui updates
merge conflicts. overwritten parts from An.