Add actions buttons. Regactor markup