Added toolbar and fixed zoom issue