improved some layout
versioning
more