Some Visual Improvements are done
Merge conflict is resolved