removed time lline, bug fixes and added couple of new elements