Fix toolbar flash bug and minor styling changes