fixed plugin loading
some desig changes