buttons aside of stopwatch, some markup-changes