Bug fixes.

UI Issues and added "edited" if edited by user.