Add back buttons and small layout fixes #30