Working on documentation and remaining everything to just toolbar