OP-1347 - Add title/icon, cleanup and fix modality