Added new button
Fixed conflicts, added buttons