Fix docking
Enlarge docking area
Remove unused function