Refactor of Marc's timer,/Fixed home issue

Refactor of Marc's timer,/Fixed home issue myLibrary working