UI improvements, added buttons