Improve wording & design