Merging lots of changes to admin module

also changes in style.css in public folder