Added toolbar, made ActionListeners into objects