Fix margin issues and add new plugins