Changed Done -> Back (win), closes #609
Small padding refactor (win)