Fixed dropdown issue and circle issue