Add timer, rearrange GUI