Improved layout of plugin and added condensing just in case