Move button and h2 to tasklist
put name at top of tasklist