First UI update and readability