small fixes buttons etc