UI improvements. added buttons and icons
merged cookie_template UI conflicts