add timer, some buttons and design fixes