Fixed broken Paintbrush right click + cleaned up