Fixed one last timer issue and a layout issue