more work on user panel, removed swp files