Merge

Merge recent work. The launcher is almost optimal, and some buttons which didn't do anything is removed. Still some bugs.