whole host of changes, but in a2, added buttons and starting line to bar