Some refactor swing components