Back button tests + minor UI improvements