[TASK] coding style cleanup, separate toolbar