1. Back button's stub added
2. Cleanups and renamings to get rid of ambiguity