Added toolbar, relayouted main window