Some handlers and buttons moved

Some more handlers and buttons moved. Still not usable mostly.

Change-Id: I19c9c36a490030369b4e8d84b41f6d2962665426