#728 | RT, Vinay | Fix back buttons