Timer and Visual improvements