Some UI improvements
Fixed crash
Changed default button