button fix etc

Signed-off-by: schlaabu <john.cow@gmail.com>