Removed duplicated code.
Made class active for timebar separate
Small fix