Cleanup, make compatible with latest dialog plugin, change to fluid layout