ui fixes.
UI improvements.
frofile fixed.
Final code in this branch
resolving conflicts