Still trying to improve design consistency