Implementing Double click and fixing fill method