Layout and timer fixes