finished html of admin panel
merge conflict