removed extra code for toolbar and added ful_name helper