Getting rid of unnecesary tags in the layout & fixing language strings