Added Dave's latest changes

Work on admin panel and module administration