Preliminary launcher support, UI tweaks