Added toolbar, changed paint panel init logic