Add toolbar and fix mistake..