Admin and Dashboard Changes Complete

Few more fixes from the last to sort out and design issues.