adapting plugin_framework to fluid layout
merging local fluid changes with master