Changed buttons and Assets Behaviour