Elaine: back buttons, button positioning, small fix