finer tweaks and addition of a toolbar