modified buttons and ui aspects