UI changes:
 * Added cross
 * Removed not required buttons
Merge remote-tracking branch 'origin/master'