Update in design and in butons