added dropdown time, fixed bugs