changed template of toolbar and fixed bug with homepage