updated so no longer embeded, cleaned up the UI