Major upadtes w/r/ defects

Many defects fixed
improvised UI
localization issues resolved