Adding smart back buttons

Complete and Continue