Fixed dropdown and time width
Some refactoring