toolbar and some friend functionality added