Small changes for appearance and UI