Improved plugin structure again. And some form CSS improvements