jon layout refactor
adminpanel updates