Redesign preferences + return check