Added logo; cleaned up a bit