Removing unused strings
Minor update
Update layout