Bug 20 follow up; UI rewrite/Minor Enhancements