Fixes modularity and admin ui revised