Bye superfish :)
-- and some button based fixes :P
Signed-off-by: Antes <antes@simplemachines.org>