Settings screen cleanup