Further updates and cleanup on admin area