MOB-1530

**DO NOT MERGE YET**
the back button part of desc is probably not needed anymore?