fixed some bugs with time. Decorate a lil for list layout