Massive plugin and UI improvements